Resolve CVS conflicts

diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el
index ea5fd421fe5ea36aec2fef4e8af6606cc571739e..35a5780aa451f17f948784e9484f984039345882 100644 (file)
--- a/lisp/progmodes/grep.el
+++ b/lisp/progmodes/grep.el
@@ -532,3 +532,4 @@ those sub directories of DIR."
 
 ;;; grep.el ends here
  
+;;; arch-tag: 5a5b9169-a79d-4f38-9c38-f69615f39c4d